diff --git a/lib/searchkick.rb b/lib/searchkick.rb
index 7ccd726..b73703a 100644
--- a/lib/searchkick.rb
+++ b/lib/searchkick.rb
@@ -81,7 +81,17 @@ module Searchkick
   end
 
   def self.search(term = "*", **options, &block)
-    query = Searchkick::Query.new(nil, term, options)
+    klass = options[:model]
+
+    # TODO add in next major version
+    # if !klass
+    #   index_name = Array(options[:index_name])
+    #   if index_name.size == 1 && index_name.first.respond_to?(:searchkick_index)
+    #     klass = index_name.first
+    #   end
+    # end
+
+    query = Searchkick::Query.new(klass, term, options.except(:model))
     block.call(query.body) if block
     if options[:execute] == false
       query
diff --git a/lib/searchkick/index.rb b/lib/searchkick/index.rb
index 47675c3..437f790 100644
--- a/lib/searchkick/index.rb
+++ b/lib/searchkick/index.rb
@@ -159,6 +159,7 @@ module Searchkick
 
     # search
 
+    # TODO remove in next major version
     def search_model(searchkick_klass, term = "*", **options, &block)
       query = Searchkick::Query.new(searchkick_klass, term, options)
       yield(query.body) if block
diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb
index 83e7a33..bc936af 100644
--- a/lib/searchkick/model.rb
+++ b/lib/searchkick/model.rb
@@ -26,7 +26,7 @@ module Searchkick
 
         class << self
           def searchkick_search(term = "*", **options, &block)
-            searchkick_index.search_model(self, term, options, &block)
+            Searchkick.search(term, {model: self}.merge(options), &block)
           end
           alias_method Searchkick.search_method_name, :searchkick_search if Searchkick.search_method_name
 
--
libgit2 0.21.0