Tom Bombadil and Goldberry I recall from LOTR but not The Hobbit. But it's been a while.
You're right. I always get that mixed up because of the Adventures of Tom Bombadil where he mentions the Shire and Hobbits. My favorite character from the books and grossly under represented. The Ring apparently has no effect on him and he was around before Sauron came to Middle Earth.