diff --git a/flake.lock b/flake.lock
index e4124d0..18bbb8f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -554,6 +554,31 @@
         "type": "github"
       }
     },
+    "jj": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1753688201,
+        "narHash": "sha256-w/9KRAo73+tEnn6FTewH5/FOIwf23W8UqXSDc9MCix4=",
+        "owner": "gusinacio",
+        "repo": "jj",
+        "rev": "8b0a360c6cf10b0dfa6ba6ecd423a4e603d8272a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gusinacio",
+        "ref": "lfs",
+        "repo": "jj",
+        "type": "github"
+      }
+    },
     "jovian": {
       "inputs": {
         "nix-github-actions": "nix-github-actions",
@@ -1062,6 +1087,7 @@
         "helix": "helix",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
+        "jj": "jj",
         "jovian": "jovian",
         "master": "master",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
@@ -1121,6 +1147,27 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "jj",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752892850,
+        "narHash": "sha256-LLvDqLiK2+dr7bQqKTnZIZ8F1H67DLt3FUyVrGolGVw=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "742248f12aed0183a124637e8b27a238a47f46a2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index c8eb338..4a8ad21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -161,6 +161,7 @@
     rofi-nix.url = "git+https://git.sr.ht/~fgaz/rofi-nix";
     rofi.url = "github:davatorium/rofi/next";
     rofi.flake = false;
+    jj.url = "github:gusinacio/jj/lfs"; # HACK: to get lfs support early
 
     # Neovim
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
@@ -193,6 +194,8 @@
     git-hooks.inputs.nixpkgs.follows = "nixpkgs";
     helix.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    jj.inputs.flake-utils.follows = "flake-utils";
+    jj.inputs.nixpkgs.follows = "nixpkgs";
     jovian.inputs.nixpkgs.follows = "nixpkgs";
     neovim-nightly-overlay.inputs.flake-compat.follows = "flake-compat";
     neovim-nightly-overlay.inputs.flake-parts.follows = "flake-parts";
diff --git a/modules/moritz/profiles/jujutsu.nix b/modules/moritz/profiles/jujutsu.nix
index c376bf3..f03d6a8 100644
--- a/modules/moritz/profiles/jujutsu.nix
+++ b/modules/moritz/profiles/jujutsu.nix
@@ -1,6 +1,8 @@
 {
   lib,
   config,
+  inputs,
+  pkgs,
   ...
 }: let
   inherit (lib) mkEnableOption mkIf;
@@ -11,6 +13,7 @@ in {
   config = mkIf cfg.enable {
     home-manager.users.moritz.programs.jujutsu = {
       enable = true;
+      package = inputs.jj.packages.${pkgs.system}.default;
       settings = {
         user = {
           email = "mail@moritzboeh.me";