diff --git a/flake.nix b/flake.nix
index 0a179a7..4f3d0af 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,6 +33,14 @@
       ...
     }:
     let
+      pkgs-for-system = (
+        system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+          overlays = [ claude-code.overlays.default ];
+        }
+      );
       modules-for-system =
         pkgs:
         pkgs.stdenv.mkDerivation {
@@ -59,10 +67,7 @@
     {
       homeConfigurations.redbook =
         let
-          pkgs = import nixpkgs {
-            system = "aarch64-darwin";
-            config.allowUnfree = true;
-          };
+          pkgs = pkgs-for-system "aarch64-darwin";
           modules = modules-for-system pkgs;
         in
         home-manager.lib.homeManagerConfiguration {
@@ -83,17 +88,10 @@
               jfrikker.redbook.enable = true;
             }
           ];
-
-          extraSpecialArgs = {
-            claude-code = claude-code.packages.aarch64-darwin.default;
-          };
         };
       homeConfigurations.home =
         let
-          pkgs = import nixpkgs {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-          };
+          pkgs = pkgs-for-system "x86_64-linux";
           modules = modules-for-system pkgs;
         in
         home-manager.lib.homeManagerConfiguration {
@@ -111,17 +109,10 @@
               jfrikker.enable = true;
             }
           ];
-
-          extraSpecialArgs = {
-            claude-code = claude-code.packages.x86_64-linux.default;
-          };
         };
       homeConfigurations.home-laptop =
         let
-          pkgs = import nixpkgs {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-          };
+          pkgs = pkgs-for-system "x86_64-linux";
           modules = modules-for-system pkgs;
         in
         home-manager.lib.homeManagerConfiguration {
@@ -181,9 +172,6 @@
           ];
 
           # extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; };
-          extraSpecialArgs = {
-            claude-code = claude-code.packages.x86_64-linux.default;
-          };
         };
       packages.x86_64-linux.default = modules-for-system nixpkgs.legacyPackages.x86_64-linux;
       packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin;
diff --git a/home.org b/home.org
index faf8e41..8172baa 100644
--- a/home.org
+++ b/home.org
@@ -2,7 +2,7 @@
 #+PROPERTY: header-args:elisp :lexical t
 * Categories
 #+begin_src nix :tangle target/default.nix
-  {lib, pkgs, config, claude-code, ...}: let
+  {lib, pkgs, config, ...}: let
     inherit (lib)
       mkIf
       mkMerge
@@ -781,7 +781,6 @@ Actually, nix *really* requires ~bash~. This is a plugin that allows using zsh f
   {
     programs.claude-code = {
       enable = true;
-      package = claude-code;
     };
   }
 #+END_SRC