diff --git a/config/home-manager.nix b/config/home-manager.nix
index 19cce01..341a940 100644
--- a/config/home-manager.nix
+++ b/config/home-manager.nix
@@ -11,7 +11,7 @@
 let
   inherit (pkgs) fd fzf;
   pokemon-colorscripts = lib.attrByPath [
-    pkgs.system
+    pkgs.stdenv.hostPlatform.system
     "pokemon-colorscripts"
   ] null inputs.jawz-scripts.packages;
   shellType = if osConfig == null then preferredShell else osConfig.my.shell.type;
diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index 928df94..613c95c 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -130,7 +130,7 @@ in
         claude-code
         claude-monitor
         ;
-      inherit (inputs.clip-tools.packages.${pkgs.system})
+      inherit (inputs.clip-tools.packages.${pkgs.stdenv.hostPlatform.system})
         clip-thumbnailer
         ;
     };
diff --git a/modules/dev/mcp/common.nix b/modules/dev/mcp/common.nix
index bafa849..403e980 100644
--- a/modules/dev/mcp/common.nix
+++ b/modules/dev/mcp/common.nix
@@ -2,7 +2,7 @@
 let
   packages = [
     pkgs.codex
-    inputs.self.packages.${pkgs.system}.nixos-mcp
+    inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.nixos-mcp
   ];
 in
 {