diff --git a/modules/sway.nix b/modules/sway.nix
index ec1d309..32b4067 100644
--- a/modules/sway.nix
+++ b/modules/sway.nix
@@ -1,7 +1,12 @@
 { config, lib, pkgs, ... }:
 
 lib.mkIf config.sbruder.gui.enable {
-  programs.sway.enable = true; # actual configuration happens in home-manager
+  # used to set up system wide configuration, actual configuration happens in
+  # home-manager
+  programs.sway = {
+    enable = true;
+    extraPackages = [ ];
+  };
 
   services.logind.lidSwitchDocked = config.services.logind.lidSwitch;
 }
diff --git a/users/simon/modules/sway.nix b/users/simon/modules/sway.nix
index 6a10a0e..75496eb 100644
--- a/users/simon/modules/sway.nix
+++ b/users/simon/modules/sway.nix
@@ -219,10 +219,10 @@ lib.mkIf config.sbruder.gui.enable {
     extraConfig = ''
       # Auto lock
       exec ${pkgs.swayidle}/bin/swayidle -w \
-              timeout 300 "swaylock -f -i ${wallpaper}" \
+              timeout 300 "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}" \
               timeout 300 'swaymsg "output * dpms off"' \
                       resume 'swaymsg "output * dpms on"' \
-              before-sleep "swaylock -f -i ${wallpaper}"
+              before-sleep "${pkgs.swaylock}/bin/swaylock -f -i ${wallpaper}"
 
       # Cursor
       seat seat0 xcursor_theme Adwaita