diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix
index 80e7961b1f82..51fe79270a66 100644
--- a/nixos/modules/services/misc/nix-ssh-serve.nix
+++ b/nixos/modules/services/misc/nix-ssh-serve.nix
@@ -1,21 +1,12 @@
 { config, lib, pkgs, ... }:
 
-let
-  serveOnly = pkgs.writeScript "nix-store-serve" ''
-    #!${pkgs.stdenv.shell}
-    if [ "$SSH_ORIGINAL_COMMAND" != "nix-store --serve" ]; then
-      echo 'Error: You are only allowed to run `nix-store --serve'\'''!' >&2
-      exit 1
-    fi
-    exec /run/current-system/sw/bin/nix-store --serve
-  '';
+with lib;
 
-  inherit (lib) mkIf mkOption types;
-in {
+{
   options = {
     nix.sshServe = {
       enable = mkOption {
-        description = "Whether to enable serving the nix store over ssh.";
+        description = "Whether to enable serving the Nix store as a binary cache via SSH.";
         default = false;
         type = types.bool;
       };
@@ -24,7 +15,7 @@ in {
 
   config = mkIf config.nix.sshServe.enable {
     users.extraUsers.nix-ssh = {
-      description = "User for running nix-store --serve.";
+      description = "Nix SSH substituter user";
       uid = config.ids.uids.nix-ssh;
       shell = pkgs.stdenv.shell;
     };
@@ -38,7 +29,7 @@ in {
         PermitTTY no
         PermitTunnel no
         X11Forwarding no
-        ForceCommand ${serveOnly}
+        ForceCommand ${config.nix.package}/bin/nix-store --serve
       Match All
     '';
   };