diff --git a/configuration/services/conduit/heisenbridge.nix b/configuration/services/conduit/heisenbridge.nix
index f0f7e49..4243ae8 100644
--- a/configuration/services/conduit/heisenbridge.nix
+++ b/configuration/services/conduit/heisenbridge.nix
@@ -46,7 +46,7 @@ in
         inherit (registration) ExecStartPre;
         ExecStart = lib.concatStringsSep " " [
           "${lib.getExe pkgs.heisenbridge}"
-          "--config \${RUNTIME_DIRECTORY}/heisenbridge-registration.yaml"
+          "--config ${registration.runtimeRegistration}"
           "--owner @tlater:matrix.tlater.net"
           "http://localhost:${toString conduitCfg.settings.global.port}"
         ];
diff --git a/configuration/services/conduit/lib.nix b/configuration/services/conduit/lib.nix
index c947a59..8ff377d 100644
--- a/configuration/services/conduit/lib.nix
+++ b/configuration/services/conduit/lib.nix
@@ -16,9 +16,6 @@ in
   #
   # This registration file needs to be manually added to conduit by
   # messaging the admin with the yaml file.
-  #
-  # TODO(tlater): Conduwuit seems to support a CLI interface for this,
-  # may want to migrate to that sometime.
   writeRegistrationScript =
     {
       id, # Must be unique among all registered appservices/bots
diff --git a/configuration/services/conduit/matrix-hookshot.nix b/configuration/services/conduit/matrix-hookshot.nix
index a297b87..33da8ec 100644
--- a/configuration/services/conduit/matrix-hookshot.nix
+++ b/configuration/services/conduit/matrix-hookshot.nix
@@ -37,7 +37,7 @@ let
       "org.matrix.msc3202" = true;
     };
 
-    runtimeRegistration = "${cfg.registrationFile}";
+    runtimeRegistration = "/var/lib/matrix-hookshot/registration.yaml";
   };
 in
 {
@@ -49,7 +49,7 @@ in
       inherit (registration) ExecStartPre;
 
       # Some library in matrix-hookshot wants a home directory
-      Environment = [ "HOME=/run/matrix-hookshot" ];
+      Environment = [ "HOME=/var/lib/matrix-hookshot" ];
 
       DynamicUser = true;
       StateDirectory = "matrix-hookshot";
@@ -80,7 +80,7 @@ in
       "conduit.service"
     ];
 
-    registrationFile = "/run/matrix-hookshot/registration.yaml";
+    registrationFile = "/var/lib/matrix-hookshot/registration.yaml";
 
     settings = {
       bridge = {