diff --git a/flake.nix b/flake.nix
index 69a5109..f467b2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,20 +80,22 @@
         # Clan wide settings. (Required)
         meta.name = "cool-clan"; # Ensure to choose a unique name.
 
-        machines = { };
-
         specialArgs = {
           inherit inputs self;
         };
 
         inventory = {
+          machines = {
+            moritz-desktop.tags = ["peer"];
+            moritz-server.tags = [];
+          };
           services.zerotier.default = {
+            roles.peer.tags = [
+              "peer"
+            ];
             roles.controller.machines = [
               "moritz-server"
             ];
-            roles.peer.machines = [
-              "moritz-desktop"
-            ];
           };
         };
       };
diff --git a/modules/shared.nix b/modules/shared.nix
index 5d16a46..4b34f2d 100644
--- a/modules/shared.nix
+++ b/modules/shared.nix
@@ -7,6 +7,7 @@
     clan-core.clanModules.root-password
     clan-core.clanModules.user-password
     clan-core.clanModules.state-version
+    clan-core.clanModules.static-hosts
   ];
 
   # Locale service discovery and mDNS