diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index a0aa003..bfdf369 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -273,6 +273,13 @@ If COUNT has been specified indent by that much, otherwise look at
       (kill-region (region-beginning) (region-end))
     (kill-line)))
 
+(defun oni:load-hippie-exp (other)
+  "Make sure both hippie-expand and yasnippet are loaded in order
+  to add yasnippet's expand function to hippie-expand."
+  (require other)
+  (add-to-list 'hippie-expand-try-functions-list
+               'yas/hippie-try-expand))
+
 (defun oni:lua-mode-func()
   "Function for `lua-mode-hook'."
   (local-unset-key (kbd ")"))