diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index 62ede3b..d0871ee 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -14,6 +14,7 @@ inputs.nixpkgs.lib.nixosSystem {
     sops-nix.nixosModules.sops
     ./hardware-configuration.nix
     ./audio.nix
+    ./netbird.nix
     ../../modules/common
     ../../modules/nixos
     {
@@ -42,7 +43,7 @@ inputs.nixpkgs.lib.nixosSystem {
       # networking.networkmanager.enable = true;
       time.timeZone = "America/New_York";
       nix.settings.experimental-features = [ "nix-command" "flakes" ];
-      
+
       nixpkgs.config.allowUnfree = true;
       system.stateVersion = "23.11";
       home-manager.backupFileExtension = "backup";
@@ -60,13 +61,7 @@ inputs.nixpkgs.lib.nixosSystem {
       element.enable = true;
       firefox.enable = true;
       kitty.enable = true;
-      # netbird.enable = true;
-      netbird = {
-        enable = true;
-        management_url = "https://netbird.moosenet.work:443";
-        admin_url = "https://netbird.moosenet.work";
-        setup_key = sops.netbird.setup_keys.end_user;
-      };
+      # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?)
       openrgb.enable = true;
       prusa-slicer.enable = true;
       spotifyd.enable = true;
diff --git a/hosts/kim/netbird.nix b/hosts/kim/netbird.nix
new file mode 100644
index 0000000..0c99d12
--- /dev/null
+++ b/hosts/kim/netbird.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+{
+  netbird = {
+    enable = true;
+    opts = {
+      management_url = "https://netbird.moosenet.work:443";
+      admin_url = "https://netbird.moosenet.work";
+      setup_key = sops.netbird.setup_keys.end_user;
+    };
+  };
+}