diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 56c597dffcb..70d0d57204d 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -142,7 +142,7 @@ module API
         project = Project.find_by_full_path(relative_path.sub(/\.(git|wiki)\z/, ''))
 
         begin
-          Gitlab::GitalyClient::Notifications.new(project.repository_storage, relative_path).post_receive
+          Gitlab::GitalyClient::Notifications.new(project.repository).post_receive
         rescue GRPC::Unavailable => e
           render_api_error(e, 500)
         end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index c0572fb50c1..fc473b2c21e 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -973,7 +973,7 @@ module Gitlab
       end
 
       def gitaly_channel
-        Gitlab::GitalyClient::Util.channel(@repository_storage)
+        Gitlab::GitalyClient.get_channel(@repository_storage)
       end
 
       private
@@ -1255,7 +1255,7 @@ module Gitlab
       end
 
       def gitaly_ref_client
-        @gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(@repository_storage, @relative_path)
+        @gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(self)
       end
     end
   end
diff --git a/lib/gitlab/gitaly_client/notifications.rb b/lib/gitlab/gitaly_client/notifications.rb
index f9355e7b439..a94a54883db 100644
--- a/lib/gitlab/gitaly_client/notifications.rb
+++ b/lib/gitlab/gitaly_client/notifications.rb
@@ -3,14 +3,14 @@ module Gitlab
     class Notifications
       attr_accessor :stub
 
-      def initialize(repository_storage, relative_path)
-        @channel = Util.channel(repository_storage)
-        @repository = Util.repository(repository_storage, relative_path)
-        @stub = Gitaly::Notifications::Stub.new(nil, nil, channel_override: @channel)
+      # 'repository' is a Gitlab::Git::Repository
+      def initialize(repository)
+        @gitaly_repo = repository.gitaly_repository
+        @stub = Gitaly::Notifications::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
       end
 
       def post_receive
-        request = Gitaly::PostReceiveRequest.new(repository: @repository)
+        request = Gitaly::PostReceiveRequest.new(repository: @gitaly_repo)
         @stub.post_receive(request)
       end
     end
diff --git a/lib/gitlab/gitaly_client/ref.rb b/lib/gitlab/gitaly_client/ref.rb
index 3b1eca21d11..d3c0743db4e 100644
--- a/lib/gitlab/gitaly_client/ref.rb
+++ b/lib/gitlab/gitaly_client/ref.rb
@@ -3,24 +3,24 @@ module Gitlab
     class Ref
       attr_accessor :stub
 
-      def initialize(repository_storage, relative_path)
-        @channel = Util.channel(repository_storage)
-        @repository = Util.repository(repository_storage, relative_path)
-        @stub = Gitaly::Ref::Stub.new(nil, nil, channel_override: @channel)
+      # 'repository' is a Gitlab::Git::Repository
+      def initialize(repository)
+        @gitaly_repo = repository.gitaly_repository
+        @stub = Gitaly::Ref::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
       end
 
       def default_branch_name
-        request = Gitaly::FindDefaultBranchNameRequest.new(repository: @repository)
+        request = Gitaly::FindDefaultBranchNameRequest.new(repository: @gitaly_repo)
         stub.find_default_branch_name(request).name.gsub(/^refs\/heads\//, '')
       end
 
       def branch_names
-        request = Gitaly::FindAllBranchNamesRequest.new(repository: @repository)
+        request = Gitaly::FindAllBranchNamesRequest.new(repository: @gitaly_repo)
         consume_refs_response(stub.find_all_branch_names(request), prefix: 'refs/heads/')
       end
 
       def tag_names
-        request = Gitaly::FindAllTagNamesRequest.new(repository: @repository)
+        request = Gitaly::FindAllTagNamesRequest.new(repository: @gitaly_repo)
         consume_refs_response(stub.find_all_tag_names(request), prefix: 'refs/tags/')
       end
 
diff --git a/lib/gitlab/gitaly_client/util.rb b/lib/gitlab/gitaly_client/util.rb
index b9d209dd0fe..4acd297f5cb 100644
--- a/lib/gitlab/gitaly_client/util.rb
+++ b/lib/gitlab/gitaly_client/util.rb
@@ -9,10 +9,6 @@ module Gitlab
             relative_path: relative_path,
           )
         end
-
-        def channel(repository_storage)
-          GitalyClient.get_channel(repository_storage)
-        end
       end
     end
   end
diff --git a/spec/lib/gitlab/gitaly_client/notifications_spec.rb b/spec/lib/gitlab/gitaly_client/notifications_spec.rb
index 39c2048fef8..b87dacb175b 100644
--- a/spec/lib/gitlab/gitaly_client/notifications_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/notifications_spec.rb
@@ -4,7 +4,7 @@ describe Gitlab::GitalyClient::Notifications do
   describe '#post_receive' do
     let(:project) { create(:empty_project) }
     let(:repo_path) { project.repository.path_to_repo }
-    subject { described_class.new(project.repository_storage, project.full_path + '.git') }
+    subject { described_class.new(project.repository) }
 
     it 'sends a post_receive message' do
       expect_any_instance_of(Gitaly::Notifications::Stub).
diff --git a/spec/lib/gitlab/gitaly_client/ref_spec.rb b/spec/lib/gitlab/gitaly_client/ref_spec.rb
index 79c9ca993e4..5405eafd281 100644
--- a/spec/lib/gitlab/gitaly_client/ref_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/ref_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::GitalyClient::Ref do
   let(:project) { create(:empty_project) }
   let(:repo_path) { project.repository.path_to_repo }
-  let(:client) { Gitlab::GitalyClient::Ref.new(project.repository_storage, project.full_path + '.git') }
+  let(:client) { Gitlab::GitalyClient::Ref.new(project.repository) }
 
   before do
     allow(Gitlab.config.gitaly).to receive(:enabled).and_return(true)