diff --git a/flake.lock b/flake.lock
index a0210da..aed23a0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767028240,
-        "narHash": "sha256-0/fLUqwJ4Z774muguUyn5t8AQ6wyxlNbHexpje+5hRo=",
+        "lastModified": 1768764703,
+        "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "c31afa6e76da9bbc7c9295e39c7de9fca1071ea1",
+        "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "darwin-stable": {
       "locked": {
-        "lastModified": 1767190699,
-        "narHash": "sha256-61alfmn3atapSHUSdz7bXHIWJcFof5ap2aXqFnXE2AQ=",
+        "lastModified": 1768649915,
+        "narHash": "sha256-jc21hKogFnxU7KXSVTRmxC7u5D4RHwm9BAvDf5/Z1Uo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b203dfb5226de9961ba9ea5c9081fd0e5e85932a",
+        "rev": "3e3f3c7f9977dc123c23ee21e8085ed63daf8c37",
         "type": "github"
       },
       "original": {
@@ -94,11 +94,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1765835352,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767104570,
-        "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
+        "lastModified": 1769289524,
+        "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
+        "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1763494707,
-        "narHash": "sha256-NFj1+bz+crNY5lL2+PHdjEb3RjPo6VnUvRQtohLNZy0=",
-        "rev": "53dc27f752a9ef6b2d7e5c48124cdd9c8223c3f4",
+        "lastModified": 1768477252,
+        "narHash": "sha256-RgET5pILoiG+3GnDpgfUEA4y8ISfZe6SB+geE+8U76Y=",
+        "rev": "fbe811e94e9c4efc9b9c283fe2fbb3aeff50fca7",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/53dc27f752a9ef6b2d7e5c48124cdd9c8223c3f4.tar.gz?rev=53dc27f752a9ef6b2d7e5c48124cdd9c8223c3f4"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fbe811e94e9c4efc9b9c283fe2fbb3aeff50fca7.tar.gz?rev=fbe811e94e9c4efc9b9c283fe2fbb3aeff50fca7"
       },
       "original": {
         "type": "tarball",
@@ -301,11 +301,11 @@
     "neorg": {
       "flake": false,
       "locked": {
-        "lastModified": 1764799180,
-        "narHash": "sha256-EzqPcvZTS4+wSOalmQkTSgcRf0MBKSZy2ntbah3sZgE=",
+        "lastModified": 1769096583,
+        "narHash": "sha256-f2CSo9E/kqzZIJ6esgxHJFwrceLUAZt/veIHQsetzO4=",
         "owner": "nvim-neorg",
         "repo": "neorg",
-        "rev": "de0bf99a95f4053862f0e63c8083b5e14f3ad6ec",
+        "rev": "f81b9d2c770b92d9bd28c85975da7d301da33882",
         "type": "github"
       },
       "original": {
@@ -326,11 +326,11 @@
         "norg-meta": "norg-meta"
       },
       "locked": {
-        "lastModified": 1767262885,
-        "narHash": "sha256-OhboWVMe5ENdk9+DzCB2Qf9KATn8xHAbBvhvE8A61t8=",
+        "lastModified": 1769344822,
+        "narHash": "sha256-edNwAnmq5B3zq9VYXMaEQ6QpCjB2iK+WKXWCOjuR1H4=",
         "owner": "nvim-neorg",
         "repo": "nixpkgs-neorg-overlay",
-        "rev": "cfa18c14358de5f7ec8b3b0922b1af97df0ab5af",
+        "rev": "3aac5de33e75ab3cf8e2d628b8623f9f1b9c8902",
         "type": "github"
       },
       "original": {
@@ -430,11 +430,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1767242400,
-        "narHash": "sha256-knFaYjeg7swqG1dljj1hOxfg39zrIy8pfGuicjm9s+o=",
+        "lastModified": 1769330179,
+        "narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c04833a1e584401bb63c1a63ddc51a71e6aa457a",
+        "rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe",
         "type": "github"
       },
       "original": {
diff --git a/modules/fish.nix b/modules/fish.nix
index 60afcff..7fcad17 100644
--- a/modules/fish.nix
+++ b/modules/fish.nix
@@ -53,6 +53,10 @@
           eza -Alh --git $argv
         end
       '';
+
+      "=" = ''
+        numbat -e "$argv"
+      '';
     };
 
     loginShellInit = ''
diff --git a/modules/jj.nix b/modules/jj.nix
index cc66995..a21bfd0 100644
--- a/modules/jj.nix
+++ b/modules/jj.nix
@@ -123,7 +123,7 @@
               label(if(current_working_copy, "working_copy"),
                 concat(
                   separate(" ",
-                    format_short_change_id_with_hidden_and_divergent_info(self),
+                    format_short_change_id_with_change_offset(self),
                     if(empty, label("empty", "(empty)")),
                     if(description,
                       description.first_line(),
@@ -132,7 +132,7 @@
                     bookmarks,
                     tags,
                     working_copies,
-                    if(git_head, label("git_head", "HEAD")),
+                    if(self.contained_in('first_parent(@)'), label("git_head", "HEAD")),
                     if(conflict, label("conflict", "conflict")),
                     if(config("ui.show-cryptographic-signatures").as_boolean(),
                       format_short_cryptographic_signature(signature)),
diff --git a/modules/tools.nix b/modules/tools.nix
index 6f843ca..d9a4b77 100644
--- a/modules/tools.nix
+++ b/modules/tools.nix
@@ -21,6 +21,7 @@ in {
     pkgs.jaq
     jaq-as-jq
     pkgs.jo
+    pkgs.numbat
     pkgs.lnav
     pkgs.pngpaste
     pkgs.reuse