diff --git a/modules/desktop/apps.nix b/modules/desktop/apps.nix
index 7c442ce..5353afc 100644
--- a/modules/desktop/apps.nix
+++ b/modules/desktop/apps.nix
@@ -24,7 +24,7 @@ in {
     programs.noisetorch.enable = true;
 
     home-manager.users.${username} = {
-      programs.fish.shellAliases.open = "xdg-open";
+      programs.fish.shellAliases.open = "${getBin pkgs.xdg-utils}/bin/xdg-open";
       home.packages = with pkgs; [
         # Nix
         inputs.nil.default
diff --git a/modules/shell/bat.nix b/modules/shell/bat.nix
index 51a6f23..f1dc436 100644
--- a/modules/shell/bat.nix
+++ b/modules/shell/bat.nix
@@ -26,11 +26,11 @@ in {
             set -x LESS "$LESS -R";
             set -x BATPIPE "color";
           '';
-          shellAliases = {
-            cat = "bat";
-            watch = "batwatch";
-            rcat = "command cat";
-            man = "batman";
+          shellAliases = with pkgs.bat-extras; {
+            cat = "${getExe config.home-manager.users.${username}.programs.bat.package}";
+            watch = "${getExe batwatch}";
+            rcat = "command ${getBin pkgs.toybox}/bin/cat";
+            man = "${getExe batman}";
           };
         };
         bat = {
diff --git a/modules/shell/tools.nix b/modules/shell/tools.nix
index 228d7e6..291585b 100644
--- a/modules/shell/tools.nix
+++ b/modules/shell/tools.nix
@@ -29,9 +29,9 @@ in {
 
       programs = {
         fish = {
-          shellAliases = {
-            lzd = "lazydocker";
-            tree = "tre";
+          shellAliases = with pkgs; {
+            lzd = "${getExe lazydocker}";
+            tree = "${getExe tre-command}";
 
             # On-demand tools
             dig = "nix run nixpkgs#dogdns"; # A command-line DNS client.