diff --git a/modules/features/greetd.nix b/modules/features/greetd.nix
index 711a969..7cc547c 100644
--- a/modules/features/greetd.nix
+++ b/modules/features/greetd.nix
@@ -3,8 +3,10 @@
   flake.modules.nixos.greetd = { pkgs, lib, config, ... }:
   let
     niriPackage = if config.programs.niri.enable then config.programs.niri.package else pkgs.niri;
+    niriExe = lib.getExe niriPackage;
+    regreetExe = lib.getExe config.programs.regreet.package;
     greeterNiriConfig = pkgs.writeText "niri-greeter.kdl" ''
-      spawn-sh-at-startup "regreet; niri msg action quit --skip-confirmation"
+      spawn-at-startup "${regreetExe}"
       hotkey-overlay {
         skip-at-startup
       }
@@ -16,7 +18,7 @@
       enable = true;
       settings = {
         default_session = {
-          command = "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe niriPackage} --config ${greeterNiriConfig}";
+          command = "${pkgs.dbus}/bin/dbus-run-session -- ${niriExe} --config ${greeterNiriConfig}";
           user = "greeter";
         };
       };