diff --git a/hosts/notice-me-senpai/grafana.nix b/hosts/notice-me-senpai/grafana.nix
index 0e8a65d..4ef87a0 100644
--- a/hosts/notice-me-senpai/grafana.nix
+++ b/hosts/notice-me-senpai/grafana.nix
@@ -81,7 +81,7 @@ in
     loki = {
       enable = true;
       configuration = {
-        server.http_listen_port = 3100;
+        server.http_listen_port = registry.port-loki;
         auth_enabled = false;
 
         ingester = {
diff --git a/hosts/tram-borzoi/postgres.nix b/hosts/tram-borzoi/postgres.nix
index 753bfda..08e82bd 100644
--- a/hosts/tram-borzoi/postgres.nix
+++ b/hosts/tram-borzoi/postgres.nix
@@ -14,7 +14,7 @@
     port = 5432;
     authentication =
       let
-        senpai-ip = self.nixosConfigurations.notice-me-senpai._module.specialArgs.registry.wgAddr4;
+        senpai-ip = self.unevaluatedNixosConfigurations.notice-me-senpai.specialArgs.registry.wgAddr4;
         # TODO: fixme
         uranus-ip = "10.13.37.9";
       in
diff --git a/modules/TLMS/monitoring.nix b/modules/TLMS/monitoring.nix
index 0786cad..1d5e98c 100644
--- a/modules/TLMS/monitoring.nix
+++ b/modules/TLMS/monitoring.nix
@@ -1,7 +1,7 @@
 { lib, config, self, registry, ... }:
 let
   cfg = config.deployment-TLMS.monitoring;
-  monitoring-host = self.nixosConfigurations.notice-me-senpai;
+  monitoring-host-registry = self.unevaluatedNixosConfigurations.notice-me-senpai.specialArgs.registry;
 in
 {
   options.deployment-TLMS.monitoring = with lib; {
@@ -59,7 +59,7 @@ in
             filename = "/tmp/positions.yaml";
           };
           clients = [{
-            url = "http://${monitoring-host._module.specialArgs.registry.wgAddr4}:${toString monitoring-host.config.services.loki.configuration.server.http_listen_port}/loki/api/v1/push";
+            url = "http://${monitoring-host-registry.wgAddr4}:${toString monitoring-host-registry.port-loki}/loki/api/v1/push";
           }];
           scrape_configs = [{
             job_name = "journal";
diff --git a/modules/data-hoarder/postgres.nix b/modules/data-hoarder/postgres.nix
index 3a16ac9..0e774f8 100644
--- a/modules/data-hoarder/postgres.nix
+++ b/modules/data-hoarder/postgres.nix
@@ -6,7 +6,7 @@
     enableTCPIP = true;
     authentication = let
       senpai-ip =
-        self.nixosConfigurations.notice-me-senpai._module.specialArgs.registry.wgAddr4;
+        self.unevaluatedNixosConfigurations.notice-me-senpai.specialArgs.registry.wgAddr4;
     in pkgs.lib.mkOverride 10 ''
       local	all	all	trust
       host	all	all	127.0.0.1/32	trust
diff --git a/registry/default.nix b/registry/default.nix
index ecbe8b1..1fddcfc 100644
--- a/registry/default.nix
+++ b/registry/default.nix
@@ -20,6 +20,7 @@
     wgAddr4 = "10.13.37.200";
     wireguardPublicKey = "z2E9TjL9nn0uuLmyQexqddE6g8peB5ENyf0LxpMolD4=";
     publicWireguardEndpoint = null;
+    port-loki = 3100;
   };
   uranus = {
     hostName = "uranus";