diff --git a/modules/baseline.nix b/modules/baseline.nix
index a0b273f..0ee7609 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -13,13 +13,10 @@
   nixpkgs.config.allowUnfree = true;
   environment.variables.NIXPKGS_ALLOW_UNFREE = "1";
 
-  environment.etc.nixpkgs.source = pkgs.path;
   environment.systemPackages = map
     (x: (pkgs.writeShellScriptBin "sc-${x}" "nixos-rebuild ${x} --refresh --flake github:buckley310/nixos-config"))
     [ "switch" "build" "boot" ];
 
-  nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
-
   systemd.tmpfiles.rules = [
     "e /nix/var/log - - - 30d"
     "e /home/sean/Downloads - - - 9d"
diff --git a/modules/cli.nix b/modules/cli.nix
index dff0880..541a1fd 100644
--- a/modules/cli.nix
+++ b/modules/cli.nix
@@ -80,6 +80,9 @@ in
 
   ];
 
+  environment.etc.nixpkgs.source = pkgs.path;
+  nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
+
   environment.etc."pip.conf".text = ''
     [install]
     no-warn-script-location = false