diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index 459fac0..1f83e48 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -56,7 +56,6 @@ inputs.nixpkgs.lib.nixosSystem {
       home-manager.backupFileExtension = "backup";
       services.openssh.enable = true;
       services.flatpak.enable = true;
-      services.netbird.enable = true; # TODO: Move this to the netbird configs
       hardware.bluetooth.enable = true;
       hardware.bluetooth.powerOnBoot = true;
       # Enable sound with pipewire.
diff --git a/modules/common/applications/netbird.nix b/modules/common/applications/netbird.nix
index 03afa3b..c1bee97 100644
--- a/modules/common/applications/netbird.nix
+++ b/modules/common/applications/netbird.nix
@@ -16,6 +16,7 @@
             pkgs.netbird-ui
           ];
         };
+        services.netbird.enable = true;
       })
       (lib.mkIf (!config.gui.enable) {
         home-manager.users.${config.user} = {
@@ -23,6 +24,7 @@
             pkgs.netbird
           ];
         };
+        services.netbird.enable = true;
       })
     ]);
 }