diff --git a/flake.nix b/flake.nix
index 747da57..652055f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -28,8 +28,7 @@ inputs = {
 	nix-impermanence.url = "github:nix-community/impermanence";
 	};
 
-outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, ... } @inputs: {
-
+outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, ... }: {
 	devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
 		name = "Environment for toast's nixos configurations";
 		# The agenix cli is not needed to activate a configuration, so instead of installing it
@@ -47,7 +46,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
 	nixosConfigurations = {
 		Archie = nixpkgs-unstable.lib.nixosSystem {
 			system = "x86_64-linux";
-			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
@@ -69,7 +67,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
 
 		SurfaceGo = nixpkgs.lib.nixosSystem {
 			system = "x86_64-linux";
-			specialArgs = { systemPkgs = inputs.nixpkgs; };
 			modules = [
 				# Needed for nix-index
 				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
@@ -85,7 +82,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
 
 		Everest = nixpkgs.lib.nixosSystem {
 			system = "x86_64-linux";
-			specialArgs = { systemPkgs = inputs.nixpkgs; };
 			modules = [
 				# Needed for nix-index
 				{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
diff --git a/roles/common/default.nix b/roles/common/default.nix
index 1e090a3..91e9eb3 100755
--- a/roles/common/default.nix
+++ b/roles/common/default.nix
@@ -3,7 +3,7 @@
 {
 	imports = [
 		./programs
-		./services
+		./services/avahi.nix
 		./configuration.nix
 	];
 }
diff --git a/roles/common/programs/nix.nix b/roles/common/programs/nix.nix
index baa1cc9..ea40ccd 100755
--- a/roles/common/programs/nix.nix
+++ b/roles/common/programs/nix.nix
@@ -1,4 +1,4 @@
-{ config, systemPkgs, ... }:
+{ config, ... }:
 
 {
 	nix = {
@@ -10,9 +10,6 @@ experimental-features = nix-command flakes
 				from = { id = "agenix"; type = "indirect"; };
 				to = { owner = "ryantm"; repo = "agenix"; type = "github"; };
 			};
-			# Write the system's nixpkgs into the registry to avoid mixing nixpkgs versions
-			# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html
-			system.flake = systemPkgs;
 		};
 	};
 }
diff --git a/roles/common/services/default.nix b/roles/common/services/default.nix
deleted file mode 100644
index 38fca78..0000000
--- a/roles/common/services/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-	imports = [
-		./avahi.nix
-		./tailscale.nix
-	];
-}
diff --git a/roles/common/services/tailscale.nix b/roles/common/services/tailscale.nix
deleted file mode 100644
index aef79f6..0000000
--- a/roles/common/services/tailscale.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, lib, ... }:
-
-{
-	services.tailscale = {
-		enable = true;
-		useRoutingFeatures = lib.mkDefault "client";
-	};
-}
diff --git a/roles/server/default.nix b/roles/server/default.nix
index d5a0970..9b262ae 100755
--- a/roles/server/default.nix
+++ b/roles/server/default.nix
@@ -13,6 +13,5 @@
 		./ddclient.nix
 		./beep.nix
 		./wireguard.nix
-		./tailscale.nix
 	];
 }
diff --git a/roles/server/tailscale.nix b/roles/server/tailscale.nix
deleted file mode 100644
index 36ba593..0000000
--- a/roles/server/tailscale.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, ... }:
-
-{
-	services.tailscale = {
-		# This is needed for being an exit node
-		useRoutingFeatures = "server";
-	};
-}