diff --git a/flake.lock b/flake.lock
index 5a2848a..66a82a0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,9 +93,30 @@
         "type": "github"
       }
     },
-    "copyparty": {
+    "ccnix": {
       "inputs": {
         "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771632347,
+        "narHash": "sha256-kNm0YX9RUwf7GZaWQu2F71ccm4OUMz0xFkXn6mGPfps=",
+        "owner": "sadjow",
+        "repo": "claude-code-nix",
+        "rev": "ec90f84b2ea21f6d2272e00d1becbc13030d1895",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sadjow",
+        "repo": "claude-code-nix",
+        "type": "github"
+      }
+    },
+    "copyparty": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
@@ -232,6 +253,24 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
       "locked": {
         "lastModified": 1678901627,
         "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
@@ -246,9 +285,9 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_3": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -337,7 +376,7 @@
     },
     "lazyvim": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
@@ -567,6 +606,7 @@
     },
     "root": {
       "inputs": {
+        "ccnix": "ccnix",
         "copyparty": "copyparty",
         "expert": "expert",
         "firefox-addons": "firefox-addons",
@@ -605,7 +645,7 @@
     "spicetify-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_5",
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1771737804,
@@ -634,7 +674,7 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_3",
+        "systems": "systems_4",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -701,6 +741,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index 767be33..e8f0585 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,6 +42,9 @@
 
     expert.url = "github:elixir-lang/expert";
     expert.inputs.nixpkgs.follows = "nixpkgs";
+
+    ccnix.url = "github:sadjow/claude-code-nix";
+    ccnix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs @ {flake-parts, ...}:
diff --git a/modules/desktop/apps/claude.nix b/modules/desktop/apps/claude.nix
index 00f114f..9faec7a 100644
--- a/modules/desktop/apps/claude.nix
+++ b/modules/desktop/apps/claude.nix
@@ -1,5 +1,10 @@
-{...}: {
-  flake.modules.nixos.desktop = {pkgs, ...}: {
-    environment.systemPackages = [pkgs.claude-code];
+{inputs, ...}: {
+  flake.modules.nixos.desktop = {pkgs, ...}: let
+    system = pkgs.stdenv.hostPlatform.system;
+  in {
+    nixpkgs.overlays = [inputs.ccnix.overlays.default];
+    environment.systemPackages = [
+      inputs.ccnix.packages.${system}.claude-code
+    ];
   };
 }