diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index 9356830a2..c797078f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.api.HostConfig
 import com.habitrpg.android.habitica.components.AppComponent
 import com.habitrpg.android.habitica.data.ApiClient
+import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.TaskRepository
 import com.habitrpg.android.habitica.data.UserRepository
 import com.habitrpg.android.habitica.events.commands.EquipCommand
@@ -34,6 +35,7 @@ import com.viewpagerindicator.IconPageIndicator
 import com.viewpagerindicator.IconPagerAdapter
 import io.reactivex.functions.Consumer
 import org.greenrobot.eventbus.Subscribe
+import org.solovyev.android.checkout.Inventory
 import java.util.*
 import javax.inject.Inject
 
@@ -46,6 +48,8 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     @Inject
     lateinit var userRepository: UserRepository
     @Inject
+    lateinit var inventoryRepository: InventoryRepository
+    @Inject
     lateinit var taskRepository: TaskRepository
 
     private val pager: FadingViewPager by bindView(R.id.viewPager)
@@ -125,7 +129,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
 
     @Subscribe
     fun onEvent(event: EquipCommand) {
-        this.apiClient.equipItem(event.type, event.key)
+        this.inventoryRepository.equip(user, event.type, event.key)
                 .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
index 2d3f5425c..e8f244601 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.kt
@@ -14,7 +14,6 @@ import android.widget.ImageView
 import android.widget.RelativeLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.AppComponent
-import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand
 import com.habitrpg.android.habitica.extensions.inflate
@@ -28,7 +27,6 @@ import com.habitrpg.android.habitica.ui.activities.SetupActivity
 import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
 import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.resetViews
 import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView
 import org.greenrobot.eventbus.EventBus
@@ -39,8 +37,6 @@ class AvatarSetupFragment : BaseFragment() {
 
     @Inject
     lateinit var customizationRepository: SetupCustomizationRepository
-    @Inject
-    lateinit var apiClient: ApiClient
     
     var activity: SetupActivity? = null
     var width: Int = 0