diff --git a/shared/commons/mesh.nix b/shared/commons/mesh.nix
index 85a4405..1438044 100644
--- a/shared/commons/mesh.nix
+++ b/shared/commons/mesh.nix
@@ -3,7 +3,8 @@
 let
     # Import nodes
     nodes = import ./../../nodes.nix;
-    myPeer = nodes."${config.hostName}";
+    myName = config.hostName;
+    myPeer = nodes."${myName}";
     myId = myPeer.id;
     myZone = myPeer.zone;
 
@@ -20,7 +21,7 @@ let
     generatedSecrets = lib.mapAttrsToList (name: node: buildSecret node.zone node.id) nodes;
 
     # Filter itself out of the peer list
-    peerConfigs = lib.filterAttrs (_peerName: peerConfig: (peerConfig.zone != myZone) || (peerConfig.id != myId)) nodes;
+    peerConfigs = lib.filterAttrs (peerName: _peerConfig: peerName != myName) nodes;
     
     interfacePeers = lib.mapAttrsToList (peerName: peerConfig: {
         PublicKey = peerConfig.wg-pub;