diff --git a/clients/quadraticserver/element-call.nix b/clients/quadraticserver/element-call.nix
index 1596a96..54df1d8 100644
--- a/clients/quadraticserver/element-call.nix
+++ b/clients/quadraticserver/element-call.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   services = let
-    domain = "call.henryhiles.com";
+    domain = "call.federated.nexus";
   in {
     livekit = {
       enable = true;
@@ -23,8 +23,8 @@
       	respond /config.json `${builtins.toJSON {
         default_server_config = {
           "m.homeserver" = {
-            "base_url" = "https://matrix.henryhiles.com";
-            "server_name" = "henryhiles.com";
+            "base_url" = config.services.grapevine.settings.server_discovery.client.base_url;
+            "server_name" = config.services.grapevine.settings.server_name;
           };
         };
         livekit.livekit_service_url = "https://${domain}/livekit";
diff --git a/clients/quadraticserver/grapevine.nix b/clients/quadraticserver/grapevine.nix
index 412ea14..a1304a9 100644
--- a/clients/quadraticserver/grapevine.nix
+++ b/clients/quadraticserver/grapevine.nix
@@ -3,13 +3,13 @@
   networking.firewall.allowedTCPPorts = [8448];
 
   services = let
-    domain = "matrix.henryhiles.com";
-    # socket = "/run/grapvine/socket";
+    domain = "federated.nexus";
+    subdomain = "matrix.${domain}";
   in {
     grapevine = {
       enable = true;
       settings = {
-        server_name = "henryhiles.com";
+        server_name = domain;
         database.backend = "rocksdb";
         federation = {
           max_concurrent_requests = 10000;
@@ -17,8 +17,8 @@
         };
 
         server_discovery = {
-          server.authority = "${domain}:443";
-          client.base_url = "https://${domain}";
+          server.authority = "${subdomain}:443";
+          client.base_url = "https://${subdomain}";
         };
 
         listen = [
@@ -30,8 +30,8 @@
       };
     };
 
-    caddy.virtualHosts."${domain}" = {
-      serverAliases = ["${domain}:8448"];
+    caddy.virtualHosts."${subdomain}" = {
+      serverAliases = ["${subdomain}:8448"];
       extraConfig = "reverse_proxy 127.0.0.3:6167";
     };
   };
diff --git a/secrets/keys.nix b/secrets/keys.nix
index c7f35a0..af9c3c0 100644
--- a/secrets/keys.nix
+++ b/secrets/keys.nix
@@ -1,5 +1,5 @@
 with builtins;
   filter (line: isString line && stringLength line != 0) (split "\n" (readFile (fetchurl {
-    url = "https://git.henryhiles.com/Henry-Hiles.keys";
+    url = "https://git.federated.nexus/Henry-Hiles.keys";
     sha256 = "1k73c228rgzq7ymf5vaj6wfqzkqm6yzq5lq0syb7mzbrvngvr2jc";
   })))