I don't know enough on either for a complete opinion (my 10th grade history teacher was quite stupid), but I like what I've heard about John Locke. Though I like Hobbes because Bill Watterson named Hobbes after Hobbes in the comic strip Calvin and Hobbes.