Toddler drinks water during night

It started as soothing during teething at around 16 months. He drinks small amounts of water from a sippy cup several times from bedtime until up for the day. I wanted to break this habit a year ago. A few obstacles stood in the way. Well one of those obstacles now agrees with me that it’s a problem and must be addressed. So he is a pretty adaptable kid but he is really attached to this habit. So, I need advice. Should I give him a less comfortable sippy cup, put something like lemon in the water? I don’t really want huge meltdowns during the night. Please give me ideas on how to accomplish this quickly. TIA