diff --git a/systems/x86_64-linux/attic/default.nix b/systems/x86_64-linux/attic/default.nix
index b6ecf43..56a8aca 100644
--- a/systems/x86_64-linux/attic/default.nix
+++ b/systems/x86_64-linux/attic/default.nix
@@ -6,6 +6,7 @@
   imports = [
     ./hardware-configuration.nix
     ./atticd.nix
+    ./headscale.nix
   ];
 
   metacfg = {
diff --git a/systems/x86_64-linux/mx/headscale.nix b/systems/x86_64-linux/attic/headscale.nix
similarity index 90%
rename from systems/x86_64-linux/mx/headscale.nix
rename to systems/x86_64-linux/attic/headscale.nix
index ffadd1b..f8b9d5e 100644
--- a/systems/x86_64-linux/mx/headscale.nix
+++ b/systems/x86_64-linux/attic/headscale.nix
@@ -1,19 +1,18 @@
 { config, ... }:
 let
-  domain = "headscale.hoyer.xyz";
+  domain = "headscale.hoyer.world";
 in
 {
   services = {
     headscale = {
       enable = true;
       address = "0.0.0.0";
-      port = 8080;
+      port = 8081;
       settings = {
         server_url = "https://${domain}";
         dns = {
           base_domain = "hoyer.tail";
           nameservers.global = [
-            "192.168.178.254"
             "1.1.1.1"
             "1.0.0.1"
             "2606:4700:4700::1111"
@@ -30,8 +29,8 @@ in
     };
 
     nginx.virtualHosts.${domain} = {
-      useACMEHost = "hoyer.xyz";
       forceSSL = true;
+      enableACME = true;
       locations."/" = {
         proxyPass = "http://localhost:${toString config.services.headscale.port}";
         proxyWebsockets = true;
diff --git a/systems/x86_64-linux/mx/default.nix b/systems/x86_64-linux/mx/default.nix
index ec2fd89..4b0c4a5 100644
--- a/systems/x86_64-linux/mx/default.nix
+++ b/systems/x86_64-linux/mx/default.nix
@@ -13,7 +13,6 @@
     ./disk-check.nix
     ./forgejo.nix
     ./hardware-configuration.nix
-    ./headscale.nix
     ./kicker.nix
     ./mailserver.nix
     ./network.nix