diff --git a/.gitignore b/.gitignore
index 32bc68d..55998da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 *
 
 !.gitignore
+!.gitmodules
 !early-init.el
 !init.el
+
+!tree-sitter-module
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0202a0e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tree-sitter-module"]
+	path = tree-sitter-module
+	url = https://github.com/casouri/tree-sitter-module.git
diff --git a/init.el b/init.el
index 2456b9d..7115101 100644
--- a/init.el
+++ b/init.el
@@ -186,16 +186,11 @@
   (evil-define-key 'normal lispyville-mode-map (kbd "C-;") #'lispy-comment)
   (evil-define-key 'visual lispyville-mode-map "iF" #'special-lispy-flow))
 
-(use-package company
-  :demand t
+(use-package treesit
+  :ensure nil
   :custom
-  (company-idle-delay 0.3)
-  :config
-  (define-key company-active-map (kbd "C-h") nil)
-  (define-key company-active-map (kbd "C-w") nil)
-  (define-key company-active-map (kbd "C-/") #'company-show-doc-buffer)
-  (define-key company-active-map (kbd "C-?") #'company-show-location)
-  (global-company-mode))
+  (treesit-extra-load-path `(,(expand-file-name "tree-sitter-module/dist/"
+                                                user-emacs-directory))))
 
 (use-package dtrt-indent
   :demand t
diff --git a/tree-sitter-module b/tree-sitter-module
new file mode 160000
index 0000000..d458a30
--- /dev/null
+++ b/tree-sitter-module
@@ -0,0 +1 @@
+Subproject commit d458a305142adf2c4f0d2d0d6549a45a38fe6a38