How do I stop using the partitive case for every direct object?

I'm at an intermediate plateau and I realize that even though I can have a decent conversation, my grasp of the object case is still very hit-or-miss. I constantly use the partitive even when the sentence requires the accusative. Does anyone have a good drill or cognitive trick to help me decide which one to use without pausing for five seconds mid-sentence? I am asking specifically about learning Finnish, not a generic study routine.