diff --git a/module/default.nix b/module/default.nix
index 735dc3053c5d90eeef45295ec6468cabdb30228a..d8c7566622adbf98d081cbb11d7bdb1f65d8dc37 100644
--- a/module/default.nix
+++ b/module/default.nix
@@ -43,7 +43,7 @@         description = "Path to mount proxy on";
       };
       stateDir = lib.mkOption {
         type = lib.types.str;
-        default = "/var/lib/tsnet-serve/${name}";
+        default = "/var/lib/tsnet-serve-${name}";
         description = "Directory to store state in";
       };
       authKey = lib.mkOption {
@@ -79,8 +79,8 @@                 ++ [
                   "--hostname=${instanceCfg.hostname}"
                   "--listen-port=${builtins.toString instanceCfg.port}"
                   "--mount-path=${instanceCfg.mountPath}"
-}: let
   pkg = pkgs.callPackage ../pkg {inherit pkgs;};
+  cfg = config.services.tsnet-serve;
                 ];
             in "${pkg}/bin/tsnet-serve ${lib.concatStringsSep " " args}";
             User = instanceCfg.user;