diff --git a/modules/server/acme.nix b/modules/server/acme.nix
index 9d29f5c..167af6e 100644
--- a/modules/server/acme.nix
+++ b/modules/server/acme.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 with lib;{
-  options.elss.server.acme.staging = mkEnableOption "Whether to use the staging or the default server for acme";
   config =
     let
       cfg = config.elss.server;
diff --git a/modules/server/default.nix b/modules/server/default.nix
index dab6fb4..ad9e563 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -1,10 +1,14 @@
 { config, lib, pkgs, ... }:
 with lib; {
-  options.elss.server.enable = mkEnableOption "Enable Mail, Web, and DB";
-  options.elss.server.nginx.enable = mkEnableOption "Set up nginx";
-  options.elss.server.sql.enable = mkEnableOption "Set up sql (postresql)";
-  options.elss.server.nextcloud.enable = mkEnableOption "Set up nextcloud";
-  options.elss.server.smailserver.enable = mkEnableOption "Set up simple mail server";
+  options.elss.server = {
+    acme.staging = mkEnableOption "Whether to use the staging or the default server for acme";
+    enable = mkEnableOption "Enable Mail, Web, and DB";
+    nginx.enable = mkEnableOption "Set up nginx";
+    sql.enable = mkEnableOption "Set up sql (postresql)";
+    nextcloud.enable = mkEnableOption "Set up nextcloud";
+    smailserver.enable = mkEnableOption "Set up simple mail server";
+    unbound.enable = mkEnableOption "Set unbound dns up";
+  };
 
   imports = [
     ./acme.nix
@@ -19,13 +23,13 @@ with lib; {
     let
       cfg = config.elss.server;
     in
-      mkIf cfg.enable {
-        elss.server = {
-          nginx.enable = mkDefault true;
-          sql.enable = mkDefault true;
-          smailserver.enable = mkDefault false; # TODO fix simple mail server
-          nextcloud.enable = mkDefault true;
-          unbound.enable = mkDefault true;
-        };
+    mkIf cfg.enable {
+      elss.server = {
+        nginx.enable = mkDefault true;
+        sql.enable = mkDefault true;
+        smailserver.enable = mkDefault false; # TODO fix simple mail server
+        nextcloud.enable = mkDefault true;
+        unbound.enable = mkDefault true;
       };
+    };
 }
diff --git a/modules/server/unbound.nix b/modules/server/unbound.nix
index 9a6a03b..2e1466d 100644
--- a/modules/server/unbound.nix
+++ b/modules/server/unbound.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 with lib; {
-  options.elss.server.unbound.enable = mkEnableOption "Set unbound dns up";
   config =
     let
       cfg = config.elss.server.unbound;