diff --git a/home-manager/default.nix b/home-manager/default.nix
index 8d19cea..13159d0 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -211,7 +211,7 @@
         wip = ''description(regex:"^\\[(wip|WIP|todo|TODO)\\]|(wip|WIP|todo|TODO):?")'';
         nocommit = ''description(regex:"^\\[(nocommit|NOCOMMIT)\\]|(nocommit|NOCOMMIT):?")'';
         dev-only = ''description(regex:"^\\[(dev-only|DEV-ONLY)\\]|(dev-only|DEV-ONLY):?")'';
-        current = ''(bookmarks() | wip | dev-only) & mine()'';
+        current = ''(bookmarks() | wip | dev-only) & mine() & ~immutable()'';
         "closest_bookmark(to)" = "heads(::to & bookmarks())";
       };
       aliases = {
@@ -220,7 +220,7 @@
         n = ["new"];
         e = ["edit"];
         tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];
-        catchup = ["rebase" "-b" "all(current() ~immutable())" "-d" "trunk()" "--skip-emptied"];
+        catchup = ["rebase" "-b" "all:current" "-d" "trunk()" "--skip-emptied"];
       };
     };
   };