diff --git a/default.nix b/default.nix
index fb52c0c1..3cc2e7af 100644
--- a/default.nix
+++ b/default.nix
@@ -35,6 +35,13 @@ device:
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    # cached-nix-shell, for instant nix-shell scripts
+    # (callPackage
+    #   (builtins.fetchTarball
+    #     https://github.com/xzfc/cached-nix-shell/archive/master.tar.gz) {})
+  ];
+
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
diff --git a/machines/default.nix b/machines/default.nix
index ee303b70..32ab2e9f 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -21,10 +21,6 @@
     exfat
     ntfs3g
     hfsprogs
-    # cached-nix-shell, for instant nix-shell scripts
-    (callPackage
-      (builtins.fetchTarball
-        https://github.com/xzfc/cached-nix-shell/archive/master.tar.gz) {})
   ];
 
   ###