diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index cb87e87..bd08d4c 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -1,11 +1,15 @@
 vim.loader.enable()
 
+-- Load custom treesitter grammar for org filetype
+require("orgmode").setup_ts_grammar()
 require("nvim-treesitter.configs").setup({
   sync_install = false,
   auto_install = false,
   highlight = {
     enable = true,
-    additional_vim_regex_highlighting = false,
+    -- Required for spellcheck, some LaTex highlights and
+    -- code block highlights that do not have ts grammar
+    additional_vim_regex_highlighting = { "org" },
   },
 })
 
diff --git a/modules/programs/nvim/plugins/orgmode.lua b/modules/programs/nvim/plugins/orgmode.lua
index 556d5e6..789eb0a 100644
--- a/modules/programs/nvim/plugins/orgmode.lua
+++ b/modules/programs/nvim/plugins/orgmode.lua
@@ -1,18 +1,4 @@
-local orgmode = require("orgmode")
--- Load custom treesitter grammar for org filetype
-orgmode.setup_ts_grammar()
--- Treesitter configuration
-require("nvim-treesitter.configs").setup({
-  -- If TS highlights are not enabled at all, or disabled via `disable` prop,
-  -- highlighting will fallback to default Vim syntax highlighting
-  highlight = {
-    enable = true,
-    -- Required for spellcheck, some LaTex highlights and
-    -- code block highlights that do not have ts grammar
-    additional_vim_regex_highlighting = { "org" },
-  },
-})
-orgmode.setup({
+require("orgmode").setup({
   org_agenda_files = { "~/Notes/org" },
   org_default_notes_file = "~/Notes/org/refile.org",
 })