diff --git a/lazy-lock.json b/lazy-lock.json
index da80e62f..80c70121 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -27,7 +27,6 @@
   "nvim-lspconfig": { "branch": "master", "commit": "16812abf0e8d8175155f26143a8504e8253e92b0" },
   "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
   "nvim-treesitter": { "branch": "main", "commit": "7caec274fd19c12b55902a5b795100d21531391f" },
-  "nvim-treesitter-textobjects": { "branch": "main", "commit": "93d60a475f0b08a8eceb99255863977d3a25f310" },
   "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
   "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
   "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" },
diff --git a/lua/kickstart/plugins/mini.lua b/lua/kickstart/plugins/mini.lua
index 5282d033..50dbe2ab 100644
--- a/lua/kickstart/plugins/mini.lua
+++ b/lua/kickstart/plugins/mini.lua
@@ -17,6 +17,7 @@ return {
       -- - sd'   - [S]urround [D]elete [']quotes
       -- - sr)'  - [S]urround [R]eplace [)] [']
       -- TODO: not sure if I need it, will disable for now
+      -- NOTE 's' keymap clashes with flash current keymaps
       -- require('mini.surround').setup()
 
       -- Simple and easy statusline.
diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua
index 8e23397d..169fd718 100644
--- a/lua/kickstart/plugins/treesitter.lua
+++ b/lua/kickstart/plugins/treesitter.lua
@@ -12,6 +12,9 @@ return {
         enable = true,
       },
     },
+    -- pin to specific commit since newest version dropped support for neovom 0.11
+    commit = '7caec274fd19c12b55902a5b795100d21531391f',
+    pin = true,
     -- main = 'nvim-treesitter.configs', -- Sets main module to use for opts
     -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
     config = function(_, opts)
@@ -72,32 +75,33 @@ return {
       end
     end,
   },
-  {
-    'nvim-treesitter/nvim-treesitter-textobjects',
-    opts = {},
-    branch = 'main',
-    config = function()
-      require('nvim-treesitter-textobjects').setup {
-        textobjects = {
-          select = {
-            enable = true,
-            -- Automatically jump forward to textobj, similar to targets.vim
-            lookahead = true,
-            keymaps = {
-              -- You can use the capture groups defined in textobjects.scm
-              ['af'] = { query = '@function.outer', desc = 'Select outer function region' },
-              ['if'] = { query = '@function.inner', desc = 'Select inner function region' },
-              ['ac'] = { query = '@class.outer', desc = 'Select outer class region' },
-              -- You can optionally set descriptions to the mappings (used in the desc parameter of
-              -- nvim_buf_set_keymap) which plugins like which-key display
-              ['ic'] = { query = '@class.inner', desc = 'Select inner class region' },
-              -- You can also use captures from other query groups like `locals.scm`
-              ['as'] = { query = '@local.scope', query_group = 'locals', desc = 'Select language scope' },
-            },
-          },
-        },
-      }
-    end,
-  },
+  -- TODO: not sure if i need it, removing for now
+  -- {
+  --   'nvim-treesitter/nvim-treesitter-textobjects',
+  --   opts = {},
+  --   branch = 'main',
+  --   config = function()
+  --     require('nvim-treesitter-textobjects').setup {
+  --       textobjects = {
+  --         select = {
+  --           enable = true,
+  --           -- Automatically jump forward to textobj, similar to targets.vim
+  --           lookahead = true,
+  --           keymaps = {
+  --             -- You can use the capture groups defined in textobjects.scm
+  --             ['af'] = { query = '@function.outer', desc = 'Select outer function region' },
+  --             ['if'] = { query = '@function.inner', desc = 'Select inner function region' },
+  --             ['ac'] = { query = '@class.outer', desc = 'Select outer class region' },
+  --             -- You can optionally set descriptions to the mappings (used in the desc parameter of
+  --             -- nvim_buf_set_keymap) which plugins like which-key display
+  --             ['ic'] = { query = '@class.inner', desc = 'Select inner class region' },
+  --             -- You can also use captures from other query groups like `locals.scm`
+  --             ['as'] = { query = '@local.scope', query_group = 'locals', desc = 'Select language scope' },
+  --           },
+  --         },
+  --       },
+  --     }
+  --   end,
+  -- },
 }
 -- vim: ts=2 sts=2 sw=2 et