diff --git a/after/plugin/mini.lua b/after/plugin/mini.lua
index af61c12..99d3b7e 100644
--- a/after/plugin/mini.lua
+++ b/after/plugin/mini.lua
@@ -15,8 +15,6 @@ require("mini.move").setup {}
 
 require("mini.operators").setup {}
 
-require("mini.splitjoin").setup {}
-
 require("mini.statusline").setup {
   use_icons = false,
 }
diff --git a/after/plugin/treesj.lua b/after/plugin/treesj.lua
new file mode 100644
index 0000000..ffb89c1
--- /dev/null
+++ b/after/plugin/treesj.lua
@@ -0,0 +1,10 @@
+local tsj = require "treesj"
+
+tsj.setup {
+  use_default_keymaps = false,
+}
+
+local nmap = require "opdavies.keymap".nmap
+
+nmap { "gJ", tsj.join }
+nmap { "gS", tsj.split }
diff --git a/lib/default.nix b/lib/default.nix
index 232b5b1..8850525 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -101,6 +101,8 @@ in rec {
       };
 
       opdavies-nvim = mkVimPlugin { inherit system; };
+
+      inherit (vimPlugins) treesj;
     in [
       customVim.nvim-tmux-navigation
       customVim.tabline-vim
@@ -142,15 +144,8 @@ in rec {
       #     vim.g.sort_motion_flags = "ui"
       #   '';
       # }
-      # {
-      #   plugin = vimPlugins.treesj;
-      #   type = "lua";
-      #   config = ''
-      #     require "treesj".setup {}
-      #   '';
-      # }
       vimPlugins.vim-sort-motion
-      vimPlugins.treesj
+      treesj
 
       # Testing
       vimPlugins.vim-test