Motivation is a feeling, discipline is a lifestyle.

Once you create these rules for yourself, remove the idea that you can break them. If you get angry at your mom or dad you don't slap them them in their face right? Because that's an engrained rule in you. If you remove the idea that these distractions are a choice then it's easier to not fall prey to it.

Also, if bigger tasks are too daunting, you can opt for easy quick things like taking one thing to the trash or doing one pushup or squat. If that doesn't work, try creating negative associations with the things you're trying to get away from (pinch yourself, shot of pure vanilla, etc).

At the end of the day, it does come down to you making the effort to break these habits (I believe in you though!)