diff --git a/flake.nix b/flake.nix
index 50cd597..a7cb03c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,6 +54,12 @@
       unstablePkgs = import unstable nixpkgsSettings;
       homeManagerSettings = { home-manager = { useGlobalPkgs = true; useUserPackages = true; }; };
 
+      commonBaseModules = [
+        ./nixos_modules/automatic-garbage-collection.nix
+        # ./nixos_modules/tailscale.nix
+        ./nixos_modules/zerotier.nix
+      ];
+
       odinBaseModules = [
         { nixpkgs = nixpkgsSettings; }
         ./odin/hardware-configuration.nix
@@ -61,20 +67,15 @@
         nixos-hardware.nixosModules.common-pc-laptop
         nixos-hardware.nixosModules.common-pc-laptop-ssd
         ./odin/common_configuration.nix
-        ./nixos_modules/automatic-garbage-collection.nix
-        ./nixos_modules/tailscale.nix
-      ];
+      ] ++ commonBaseModules;
 
       thorBaseModules = [
         { nixpkgs = nixpkgsSettings; }
-        ./nixos_modules/automatic-garbage-collection.nix
         ./thor/hardware-configuration.nix
         nixos-hardware.nixosModules.common-cpu-amd
         nixos-hardware.nixosModules.common-pc-ssd
         ./thor/configuration.nix
-        ./nixos_modules/automatic-garbage-collection.nix
-        ./nixos_modules/tailscale.nix
-      ];
+      ] ++ commonBaseModules;
 
       lokiBaseModules = [
         { nixpkgs = nixpkgsSettings; }
@@ -82,9 +83,7 @@
         nixos-hardware.nixosModules.common-cpu-intel
         nixos-hardware.nixosModules.common-pc-ssd
         ./loki/configuration.nix
-        ./nixos_modules/automatic-garbage-collection.nix
-        ./nixos_modules/tailscale.nix
-      ];
+      ] ++ commonBaseModules;
 
       odinStable = extraModules: nixpkgs.lib.nixosSystem {
         inherit system;
diff --git a/loki/configuration.nix b/loki/configuration.nix
index f9831a8..6e4677c 100644
--- a/loki/configuration.nix
+++ b/loki/configuration.nix
@@ -175,7 +175,6 @@ with lib;
       # xkbOptions = "eurosign:e;";
       # libinput.enable = true;
     };
-    zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
 
     zoneminder = {
       enable = true;
diff --git a/nixos_modules/zerotier.nix b/nixos_modules/zerotier.nix
new file mode 100644
index 0000000..7039517
--- /dev/null
+++ b/nixos_modules/zerotier.nix
@@ -0,0 +1,6 @@
+{
+  services.zerotierone = {
+    enable = true;
+    joinNetworks = [ "8056c2e21cf9c753" ];
+  };
+}
diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index 4ccfe00..6f6951f 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -168,7 +168,6 @@ with lib;
   services.gnome.gnome-keyring.enable = true;
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
-  services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
   services.gvfs = { enable = true; package = lib.mkForce pkgs.gnome3.gvfs; };
   # services.tlp.enable = false;
   services.avahi = {
diff --git a/thor/configuration.nix b/thor/configuration.nix
index 9fa341f..67a1d72 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -130,7 +130,6 @@ with lib;
       xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
     };
     # gnome.gnome-remote-desktop.enable = true;
-    zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
   };
 
   services.teamviewer.enable = true;