diff --git a/system/default.nix b/system/default.nix
index 80d21cb..7f79b90 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -13,9 +13,8 @@
   users.users.till = {
     isNormalUser = true;
     description = "Till";
-    extraGroups = [
-      "wheel"
-    ];
+    extraGroups = [ "wheel" ];
+    shell = pkgs.fish;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/system/desktop.nix b/system/desktop.nix
index a412249..6da7674 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -27,7 +27,6 @@
     extraGroups = [
       "networkmanager"
     ];
-    shell = pkgs.fish;
   };
 
   hardware.pulseaudio.enable = false;
diff --git a/system/laura.nix b/system/laura.nix
deleted file mode 100644
index 60a80df..0000000
--- a/system/laura.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  users.users.laura = {
-    home = "/home/laura";
-    isNormalUser = true;
-    description = "Laura";
-    extraGroups = [
-      "networkmanager"
-    ];
-  };
-}
diff --git a/system/lisa.nix b/system/lisa.nix
deleted file mode 100644
index 60a80df..0000000
--- a/system/lisa.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  users.users.laura = {
-    home = "/home/laura";
-    isNormalUser = true;
-    description = "Laura";
-    extraGroups = [
-      "networkmanager"
-    ];
-  };
-}
diff --git a/system/web-server.nix b/system/web-server.nix
index c51b0dc..67b4503 100644
--- a/system/web-server.nix
+++ b/system/web-server.nix
@@ -18,6 +18,11 @@
     recommendedTlsSettings = true;
   };
 
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "till@ktiu.net";
+  };
+
   services.nginx.virtualHosts."outline.ktiu.net" = {
     addSSL = true;
     enableACME = true;
@@ -37,9 +42,4 @@
     };
   };
 
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "till@ktiu.net";
-  };
-
 }