Both, but mostly tap. "I'll have a glass of tap water" "Can I just have water from the tap please" We would only use faucet if we were specifically talking about the object, for example, if we are remodeling the kitchen or bathroom. "I want a gold faucet to match the walls" "I think the faucet is too low"

both