diff --git a/configurations/home/srid@zest.nix b/configurations/home/srid@zest.nix
index 709d397..83cabff 100644
--- a/configurations/home/srid@zest.nix
+++ b/configurations/home/srid@zest.nix
@@ -5,6 +5,7 @@
     flake.inputs.self.homeModules.darwin-only
     (flake.inputs.self + /modules/home/all/1password.nix)
     (flake.inputs.self + /modules/home/all/juspay-vertex.nix)
+    (flake.inputs.self + /modules/home/claude-code)
   ];
 
   home.username = "srid";
diff --git a/modules/flake-parts/claude-sandboxed.nix b/modules/flake-parts/claude-sandboxed.nix
index 45343a2..122bc14 100644
--- a/modules/flake-parts/claude-sandboxed.nix
+++ b/modules/flake-parts/claude-sandboxed.nix
@@ -6,8 +6,8 @@ in
 {
   imports = [ landrun-nix.flakeModule ];
 
-  perSystem = { pkgs, ... }: {
-    landrunApps.claude = {
+  perSystem = { pkgs, system, lib, ... }: {
+    landrunApps.claude = lib.mkIf (lib.hasInfix "linux" system) {
       program = "${pkgs.claude-code}/bin/claude";
       imports = [
         landrunModules.gh
diff --git a/modules/home/claude-code/default.nix b/modules/home/claude-code/default.nix
index cd0f899..7f545b0 100644
--- a/modules/home/claude-code/default.nix
+++ b/modules/home/claude-code/default.nix
@@ -22,7 +22,10 @@ in
   home.packages = [
     pkgs.tree
     pkgs.python313Packages.markitdown
-    flake.inputs.self.packages.${pkgs.system}.claude # Sandboxed version from claude-sandboxed.nix
+    # Use sandboxed version on Linux, plain version on macOS
+    (if lib.hasInfix "linux" pkgs.system
+    then flake.inputs.self.packages.${pkgs.system}.claude
+    else pkgs.claude-code)
     # Other agents for trying out
     pkgs.copilot-cli
   ];