diff --git a/flake.nix b/flake.nix
index 4f6fb0a..fc72423 100755
--- a/flake.nix
+++ b/flake.nix
@@ -108,14 +108,14 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-
 			];
 		};
 
-		SurfaceGo = nixpkgs.lib.nixosSystem {
+		SurfaceGo = nixpkgs-unstable.lib.nixosSystem {
 			system = "x86_64-linux";
-			specialArgs = { systemPkgs = inputs.nixpkgs; flakeSelf = self; };
+			specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; };
 			modules = [
 				agenix.nixosModules.default
-				home-manager.nixosModule
+				home-manager-unstable.nixosModule
 				nixos-hardware.nixosModules.microsoft-surface-go
-				nix-index-db.nixosModules.nix-index
+				nix-index-db-unstable.nixosModules.nix-index
 				./roles/common
 				./roles/desktop
 				./roles/kde