diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 6438e32..9658d34 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -37,6 +37,7 @@
     services = {
       auto-gc.enable = true;
       sound.enable = true;
+      nebula.enable = true;
       sshd.enable = true;
       syncthing = {
         enable = true;
diff --git a/hosts/desktop/hardware.nix b/hosts/desktop/hardware.nix
index f64a03d..2b42c92 100644
--- a/hosts/desktop/hardware.nix
+++ b/hosts/desktop/hardware.nix
@@ -24,10 +24,14 @@ _: {
 
   zramSwap.enable = true;
 
-  # Prevent immediate wake-up from suspend caused by the logi bolt receiver
-  services.udev.extraRules = ''
-    ACTION=="add" SUBSYSTEM=="pci" ATTR{vendor}=="0x1022" ATTR{device}=="0x43ee" ATTR{power/wakeup}="disabled"
-  '';
+  services = {
+    fstrim.enable = true;
+
+    # Prevent immediate wake-up from suspend caused by the logi bolt receiver
+    udev.extraRules = ''
+      ACTION=="add" SUBSYSTEM=="pci" ATTR{vendor}=="0x1022" ATTR{device}=="0x43ee" ATTR{power/wakeup}="disabled"
+    '';
+  };
 
   hardware.fancontrol = {
     enable = true;
diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 7e72934..62c532a 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -39,6 +39,7 @@
       auto-gc.enable = true;
       bluetooth.enable = true;
       sound.enable = true;
+      nebula.enable = true;
       sshd.enable = true;
       syncthing = {
         enable = true;
diff --git a/hosts/vps-monitor/default.nix b/hosts/vps-monitor/default.nix
index da28565..b5d7e20 100644
--- a/hosts/vps-monitor/default.nix
+++ b/hosts/vps-monitor/default.nix
@@ -35,6 +35,7 @@
         onlyCleanRoots = true;
       };
 
+      nebula.enable = true;
       sshd.enable = true;
       dns.enable = true;
     };
diff --git a/hosts/vps-private/default.nix b/hosts/vps-private/default.nix
index c334679..e28d821 100644
--- a/hosts/vps-private/default.nix
+++ b/hosts/vps-private/default.nix
@@ -39,6 +39,7 @@
           onlyCleanRoots = true;
         };
 
+        nebula.enable = true;
         sshd.enable = true;
         dns.enable = true;
 
diff --git a/hosts/vps-public/default.nix b/hosts/vps-public/default.nix
index 56e5fd9..817658e 100644
--- a/hosts/vps-public/default.nix
+++ b/hosts/vps-public/default.nix
@@ -38,6 +38,7 @@
           onlyCleanRoots = true;
         };
 
+        nebula.enable = true;
         sshd.enable = true;
 
         caddy.virtualHosts."dav.${sproutedDomain}" = {
diff --git a/modules/system/networking/overlay.nix b/modules/system/networking/overlay.nix
index df79c58..21acb84 100644
--- a/modules/system/networking/overlay.nix
+++ b/modules/system/networking/overlay.nix
@@ -21,7 +21,6 @@ in
     prefixLength = lib.mkOption {
       type = lib.types.ints.between 0 32;
       default = cfg.networkCidr |> lib.splitString "/" |> lib.last |> lib.toInt;
-      readOnly = true;
     };
     domain = lib.mkOption {
       type = lib.types.nonEmptyStr;
@@ -62,10 +61,5 @@ in
         |> lib.filter (host: host.config.custom.services.dns.enable)
         |> lib.map (host: host.config.custom.networking.overlay.address);
     };
-
-    implementation = lib.mkOption {
-      type = lib.types.enum [ "nebula" ];
-      default = "nebula";
-    };
   };
 }
diff --git a/modules/system/services/nebula/default.nix b/modules/system/services/nebula/default.nix
index 6080052..b37b9d7 100644
--- a/modules/system/services/nebula/default.nix
+++ b/modules/system/services/nebula/default.nix
@@ -12,9 +12,7 @@ let
 in
 {
   options.custom.services.nebula = {
-    enable = lib.mkEnableOption "" // {
-      default = netCfg.overlay.implementation == "nebula";
-    };
+    enable = lib.mkEnableOption "";
 
     publicKeyPath = lib.mkOption {
       type = lib.types.path;