diff --git a/flake.lock b/flake.lock
index 275a1c5..e0e3fe2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -84,24 +84,6 @@
         "type": "github"
       }
     },
-    "claude-code-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1772252606,
-        "narHash": "sha256-SiIhFq4XbD3LmODQ2mTtakRBnjBn/KoSgAOId1cL1Ks=",
-        "owner": "ryoppippi",
-        "repo": "claude-code-overlay",
-        "rev": "b1ebf027412136bbbe4202741c3d48721644bc4b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryoppippi",
-        "repo": "claude-code-overlay",
-        "type": "github"
-      }
-    },
     "crane": {
       "locked": {
         "lastModified": 1765145449,
@@ -315,7 +297,7 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "neovim-src": "neovim-src",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1772409903,
@@ -365,27 +347,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768127708,
-        "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
+        "lastModified": 1772173633,
+        "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
+        "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1772461137,
-        "narHash": "sha256-5MFNMLcDmaXQbdGJVITwFTqJq3IVok4TSR/Oa/DbJys=",
+        "lastModified": 1772980247,
+        "narHash": "sha256-VVdN5UUW7b6vU+0l+Qu4M+nfQgkr+bUUtnzX54YkhqI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "388c66870001909259d1879acd2e3e1108c1854d",
+        "rev": "3c86acf9d0cb9bdfda567ab7d38e1c9ea872b73b",
         "type": "github"
       },
       "original": {
@@ -412,22 +394,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1772173633,
-        "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1772047000,
         "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
@@ -510,13 +476,12 @@
     "root": {
       "inputs": {
         "assets": "assets",
-        "claude-code-overlay": "claude-code-overlay",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nvim": "nvim",
diff --git a/flake.nix b/flake.nix
index 8f8b152..4c2741a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,7 +40,7 @@
     };
 
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-    claude-code-overlay.url = "github:ryoppippi/claude-code-overlay";
+
   };
 
   outputs =
@@ -53,7 +53,19 @@
     let
       my-lib = import ./lib { inherit (nixpkgs) lib; };
 
-      overlays = [ ];
+      overlays = [
+        (_: prev: {
+          inherit
+            (
+              (import inputs.nixpkgs-master {
+                inherit (prev.stdenv.hostPlatform) system;
+                inherit (prev) config;
+              })
+            )
+            claude-code
+            ;
+        })
+      ];
 
       mkHost = my-lib.mkHost {
         inherit
diff --git a/users/matej/home-manager.nix b/users/matej/home-manager.nix
index 1d11da1..a9b6f7d 100644
--- a/users/matej/home-manager.nix
+++ b/users/matej/home-manager.nix
@@ -15,10 +15,7 @@
     enable = true;
     package = inputs.neovim-nightly-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
   };
-  claude = {
-    enable = true;
-    package = inputs.claude-code-overlay.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  };
+  claude.enable = true;
 
   # desktop-conditional
   desktop.enable = osConfig.desktop.enable;