diff --git a/flake.nix b/flake.nix
index ef3b7fc..523799f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@ inputs = {
 	};
 };
 
-outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, nix-index-db, nix-index-db-unstable, jovian, ... } @inputs: {
+outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, nix-index-db, nix-index-db-unstable, jovian, ... } @inputs: {
 
 	devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
 		name = "Environment for toast's nixos configurations";
@@ -67,7 +67,7 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-
 	nixosConfigurations = {
 		Archie = nixpkgs-unstable.lib.nixosSystem {
 			system = "x86_64-linux";
-			specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; };
+			specialArgs = { systemPkgs = inputs.nixpkgs-unstable; };
 			/*
 			I used to set up nixpkgs in the flake, but doing that made
 			defining overlays in modules impossible (or at least I could
@@ -75,6 +75,8 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-
 			Also has nice side effect of making it easier to add new systems :3
 			*/
 			modules = [
+				# Needed for nix-index
+				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
 				agenix.nixosModules.default
 				home-manager-unstable.nixosModule
 				nix-index-db-unstable.nixosModules.nix-index
@@ -88,8 +90,10 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-
 
 		SurfaceGo = nixpkgs.lib.nixosSystem {
 			system = "x86_64-linux";
-			specialArgs = { systemPkgs = inputs.nixpkgs; flakeSelf = self; };
+			specialArgs = { systemPkgs = inputs.nixpkgs; };
 			modules = [
+				# Needed for nix-index
+				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
 				agenix.nixosModules.default
 				home-manager.nixosModule
 				nixos-hardware.nixosModules.microsoft-surface-go
@@ -103,8 +107,10 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-
 
 		SteamDeck = nixpkgs-unstable.lib.nixosSystem {
 			system = "x86_64-linux";
-			specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; };
+			specialArgs = { systemPkgs = inputs.nixpkgs-unstable; };
 			modules = [
+				# Needed for nix-index
+				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
 				agenix.nixosModules.default
 				jovian.nixosModules.default
 				home-manager-unstable.nixosModule
@@ -119,8 +125,10 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-
 		
 		Everest = nixpkgs.lib.nixosSystem {
 			system = "x86_64-linux";
-			specialArgs = { systemPkgs = inputs.nixpkgs; flakeSelf = self; };
+			specialArgs = { systemPkgs = inputs.nixpkgs; };
 			modules = [
+				# Needed for nix-index
+				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
 				agenix.nixosModules.default
 				home-manager.nixosModule
 				nix-index-db.nixosModules.nix-index
diff --git a/roles/common/configuration.nix b/roles/common/configuration.nix
index 9bf3d40..495b4f3 100755
--- a/roles/common/configuration.nix
+++ b/roles/common/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib,  pkgs, flakeSelf, ... }:
+{ config, lib,  pkgs, ... }:
 
 {
 	environment = {
@@ -85,8 +85,5 @@
 	manually on everything else
 	*/	
 	
-	system =  {
-		stateVersion = "23.05";
-		configurationRevision = flakeSelf.sourceInfo.rev or flakeSelf.sourceInfo.dirtyRev;
-	};
+	system.stateVersion = "23.05";
 }